Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 15:48:29 +0000 (08:48 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 30 Aug 2011 15:48:29 +0000 (08:48 -0700)
commit6bf3eea4670f9f7a1447c49e8a5c155a45ffc11f
tree1b6675f52fe368df2f4e9e63e3fe3ec37f7d9733
parentc84a97625165fa18daff684239115dfd60f07e51
parenta84e7c6d3c4fa2f98e4b0af6707c338b4ce03d7b
Merge from trunk.